From 84cf12c7ba095effb658508a1222287c65652b57 Mon Sep 17 00:00:00 2001
From: Gerd Moellmann <gerd@gnu.org>
Date: Sat, 27 Jan 2001 12:40:20 +0000
Subject: [PATCH] (display_line): Don't treat a newline as fitting on the line.

---
 src/xdisp.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index a8803c077ca..dffef44f487 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12229,10 +12229,12 @@ display_line (it)
       nglyphs = row->used[TEXT_AREA] - n_glyphs_before;
       hpos_before = it->hpos;
       x_before = x;
-	  
-      if (it->current_x < it->last_visible_x)
-	{
+
+      if (/* Not a newline. */
+	  nglyphs > 0
 	  /* Glyphs produced fit entirely in the line.  */
+	  && it->current_x < it->last_visible_x)
+	{
 	  it->hpos += nglyphs;
 	  row->ascent = max (row->ascent, it->max_ascent);
 	  row->height = max (row->height, it->max_ascent + it->max_descent);
-- 
2.30.2